Add ukify-fix-insertion-of-padding-in-merged-sections patch to systemd#17377
Open
vinceaperri wants to merge 1 commit into
Open
Add ukify-fix-insertion-of-padding-in-merged-sections patch to systemd#17377vinceaperri wants to merge 1 commit into
vinceaperri wants to merge 1 commit into
Conversation
vinceaperri
force-pushed
the
user/vinceaperri/backport-systemd-ukify-padding-fix
branch
from
b1d6c44 to
e610142
Compare
vinceaperri
changed the title
vinceaperri
changed the title
Contributor
There was a problem hiding this comment.
Pull request overview
This PR backports an upstream ukify fix into the Azure Linux systemd packaging to prevent creation of corrupted UKI binaries when merging data into an existing PE section.
Changes:
- Added an upstream backport patch to correct padding calculation when merging PE sections in
ukify. - Updated
systemd.specto include the new patch, bumpRelease, and add a changelog entry. - Bumped
systemd-boot-signedReleaseto keep it aligned with thesystemdpackage release.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| SPECS/systemd/ukify-fix-insertion-of-padding-in-merged-sections.patch | Adds upstream backport fixing padding logic in ukify when merging into an existing PE section. |
| SPECS/systemd/systemd.spec | Registers Patch0492, bumps Release to 28, and records the backport in %changelog. |
| SPECS-SIGNED/systemd-boot-signed/systemd-boot-signed.spec | Bumps Release to 28 to match the systemd spec release. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge Checklist
All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)
*-staticsubpackages, etc.) have had theirReleasetag incremented../cgmanifest.json,./toolkit/scripts/toolchain/cgmanifest.json,.github/workflows/cgmanifest.json)./LICENSES-AND-NOTICES/SPECS/data/licenses.json,./LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md,./LICENSES-AND-NOTICES/SPECS/LICENSE-EXCEPTIONS.PHOTON)*.signatures.jsonfilessudo make go-tidy-allandsudo make go-test-coveragepassSummary
Backports upstream ukify fix (ec1d031f3de02f84beca89e2b402d085fba62be4):
when merging into an existing PE section, padding was derived from the new
section size instead of the existing section size, which can leave
insufficient padding and corrupt the resulting UKI.
Change Log
Does this affect the toolchain?
NO
Test Methodology